From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 27 Apr 2011 17:15:37 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3911^2~50
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=909c4c4651d57e9f75fea7ab740f2ac4d343ff92;p=emacs.git

Merge from mainline.
---

909c4c4651d57e9f75fea7ab740f2ac4d343ff92